auto upstream
authorJoakim Verona <joakim@verona.se>
Thu, 27 Dec 2012 07:41:41 +0000 (08:41 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 27 Dec 2012 07:41:41 +0000 (08:41 +0100)

Trivial merge